Revert some accidentally committed changes.

svn path=/trunk/; revision=20793

diff --git a/gtk/gtkcomboboxentry.c b/gtk/gtkcomboboxentry.c
index 9d76e4e94dbd0f59ebc3f8c7ffa8b5660d931ed5..fe77f52bf54321e653c9305794836da41895c014 100644 (file)
--- a/gtk/gtkcomboboxentry.c
+++ b/gtk/gtkcomboboxentry.c
@@ -50,7 +50,6 @@ static void gtk_combo_box_entry_add              (GtkContainer          *contain
                                                  GtkWidget             *child);
 static void gtk_combo_box_entry_remove           (GtkContainer          *container,
                                                  GtkWidget             *child);
-static GType gtk_combo_box_entry_child_type      (GtkContainer          *container);
 
 static gchar *gtk_combo_box_entry_get_active_text (GtkComboBox *combo_box);
 static void gtk_combo_box_entry_active_changed   (GtkComboBox           *combo_box,
@@ -97,7 +96,6 @@ gtk_combo_box_entry_class_init (GtkComboBoxEntryClass *klass)
   container_class = (GtkContainerClass *)klass;
   container_class->add = gtk_combo_box_entry_add;
   container_class->remove = gtk_combo_box_entry_remove;
-  container_class->child_type = gtk_combo_box_entry_child_type;
 
   combo_class = (GtkComboBoxClass *)klass;
   combo_class->get_active_text = gtk_combo_box_entry_get_active_text;
@@ -238,16 +236,6 @@ gtk_combo_box_entry_remove (GtkContainer *container,
   GTK_CONTAINER_CLASS (gtk_combo_box_entry_parent_class)->remove (container, child);
 }
 
-static GType
-gtk_combo_box_entry_child_type (GtkContainer *container)
-{
-  if (!GTK_BIN (container)->child)
-    return GTK_TYPE_ENTRY;
-  else
-    return G_TYPE_NONE;
-}
-
-
 static void
 gtk_combo_box_entry_active_changed (GtkComboBox *combo_box,
                                     gpointer     user_data)